FM: No static at all.

diff --git a/gpsbabel/geo.c b/gpsbabel/geo.c
index 974ca8b5940da08445a54e25bac4a0efe4e017f3..f3b3ddcdb550577c58f1a0be9a1655c9fed49467 100644 (file)
--- a/gpsbabel/geo.c
+++ b/gpsbabel/geo.c
@@ -38,7 +38,7 @@ arglist_t geo_args[] = {
 #define MY_CBUF 4096
 
 #if NO_EXPAT
-void
+static void
 geo_rd_init(const char *fname)
 {
        fatal(MYNAME ": This build excluded GEO support because expat was not installed.\n");
@@ -143,32 +143,32 @@ void wpt_coord(const char *args, const char **attrv)
         }
 }
 
-void
+static void
 geo_rd_init(const char *fname)
 {
        xml_init(fname, loc_map, NULL);
 }
 
-void
+static void
 geo_read(void)
 {
        xml_read();
 }
 #endif
 
-void
+static void
 geo_rd_deinit(void)
 {
        xml_deinit();
 }
 
-void
+static void
 geo_wr_init(const char *fname)
 {
        ofd = xfopen(fname, "w", MYNAME);
 }
 
-void
+static void
 geo_wr_deinit(void)
 {
        fclose(ofd);
@@ -201,7 +201,7 @@ geo_waypt_pr(const waypoint *waypointp)
        fprintf(ofd, "</waypoint>\n");
 }
 
-void
+static void
 geo_write(void)
 {
        fprintf(ofd, "<?xml version=\"1.0\"?><loc version=\"1.0\" src=\"EasyGPS\">\n");

diff --git a/gpsbabel/glogbook.c b/gpsbabel/glogbook.c
index f9e21ffc4825f8f6ff832c98c15834173fd2885b..3711bcd7666dc89677cd210be49a7d41d0d26c8a 100644 (file)
--- a/gpsbabel/glogbook.c
+++ b/gpsbabel/glogbook.c
@@ -54,31 +54,31 @@ static xg_tag_mapping gl_map[] = {
  { NULL,       0,         NULL}
 };
 
-void
+static void
 glogbook_rd_init(const char *fname)
 {
        xml_init(fname, gl_map, NULL);
 }
 
-void
+static void
 glogbook_read(void)
 {
        xml_read();
 }
 
-void
+static void
 glogbook_rd_deinit(void)
 {
        xml_deinit();
 }
 
-void
+static void
 glogbook_wr_init(const char *fname)
 {
         ofd = xfopen(fname, "w", MYNAME);
 }
 
-void
+static void
 glogbook_wr_deinit(void)
 {
         fclose(ofd);
@@ -100,19 +100,19 @@ glogbook_waypt_pr(const waypoint *wpt)
        fprintf(ofd, "            </Trackpoint>\n");
 }
 
-void
+static void
 glogbook_hdr( const route_head *rte)
 {
        fprintf(ofd, "        <Track>\n");
 }
 
-void
+static void
 glogbook_ftr(const route_head *rte)
 {
        fprintf(ofd, "        </Track>\n");
 }
 
-void
+static void
 glogbook_write(void)
 {
        fprintf(ofd, "<?xml version=\"1.0\" ?>\n");

diff --git a/gpsbabel/google.c b/gpsbabel/google.c
index 070fd5af89ced5b29a58877d86d31a0af2346758..5d14561710f29cf512ef8902001b5b916421fd4c 100644 (file)
--- a/gpsbabel/google.c
+++ b/gpsbabel/google.c
@@ -33,13 +33,13 @@ static int serial = 0;
 #define MY_CBUF 4096
 
 #if NO_EXPAT
-void
+static void
 google_rd_init(const char *fname)
 {
        fatal(MYNAME ": This build excluded Google Maps support because expat was not installed.\n");
 }
 
-void
+static void
 google_read(void)
 {
 }
@@ -211,7 +211,7 @@ void goog_poly_e( const char *args, const char **unused )
        }
 }
 
-void
+static void
 google_rd_init(const char *fname)
 {
        desc_handle = mkshort_new_handle();
@@ -220,7 +220,7 @@ google_rd_init(const char *fname)
        xml_init(fname, google_map, "ISO-8859-1" );
 }
 
-void
+static void
 google_read(void)
 {
        xml_read();
@@ -243,7 +243,7 @@ google_read(void)
 }
 #endif
 
-void
+static void
 google_rd_deinit(void)
 {
        xml_deinit();

diff --git a/gpsbabel/gpx.c b/gpsbabel/gpx.c
index c1d3b233d426fd5b98e48c34cd7b07e52715430a..7fd6b7f6309003366eea364ff6cd89b508f8979d 100644 (file)
--- a/gpsbabel/gpx.c
+++ b/gpsbabel/gpx.c
@@ -873,7 +873,7 @@ gpx_end(void *data, const char *el)
 }
 
 #if NO_EXPAT
-void
+static void
 gpx_rd_init(const char *fname)
 {
        fatal(MYNAME ": This build excluded GPX support because expat was not installed.\n");
@@ -922,7 +922,7 @@ gpx_cdata(void *dta, const XML_Char *s, int len)
                *cdatalen += len;
 }
 
-void
+static void
 gpx_rd_init(const char *fname)
 {
        if ( fname[0] ) {
@@ -994,7 +994,7 @@ gpx_rd_deinit(void)
        psr = NULL;
 }
 
-void
+static void
 gpx_wr_init(const char *fname)
 {
        mkshort_handle = mkshort_new_handle();
@@ -1405,7 +1405,7 @@ void gpx_route_pr()
        route_disp_all(gpx_route_hdr, gpx_route_tlr, gpx_route_disp);
 }
 
-void
+static void
 gpx_write(void)
 {
        time_t now = 0;

diff --git a/gpsbabel/hiketech.c b/gpsbabel/hiketech.c
index 722f3de294afb9391c2e6473b7f1b1d0462adc7d..c8d5c01a24a49f4402912c498a9e33cf8bfe974d 100644 (file)
--- a/gpsbabel/hiketech.c
+++ b/gpsbabel/hiketech.c
@@ -79,24 +79,24 @@ hiketech_rd_init(const char *fname)
        xml_init(fname, ht_map, NULL);
 }
 
-void
+static void
 hiketech_read(void)
 {
        xml_read();
 }
 
-void
+static void
 hiketech_rd_deinit(void)
 {
 }
 
-void
+static void
 hiketech_wr_init(const char *fname)
 {
         ofd = xfopen(fname, "w", MYNAME);
 }
 
-void
+static void
 hiketech_wr_deinit(void)
 {
         fclose(ofd);

diff --git a/gpsbabel/hsa_ndv.c b/gpsbabel/hsa_ndv.c
index b9c6e45de96ba73036a5b02117d05cb050a5f3e8..647f5aa9558f64ea9a9c2ecb7bd990da8764f953 100644 (file)
--- a/gpsbabel/hsa_ndv.c
+++ b/gpsbabel/hsa_ndv.c
@@ -36,7 +36,7 @@ char *routeName = "ROUTENAME";
 #define ATTR_OBJECTNAME                                                "OBJNAM"
 #define ATTR_SHIPNAME                                          "shpnam"
 
-void readVersion4( FILE* pFile);
+static void readVersion4( FILE* pFile);
 
 FILE *fd;
 FILE *ofd;
@@ -54,13 +54,13 @@ arglist_t hsa_ndv_args[] = {
 
 
 #if NO_EXPAT
-void
+static void
 hsa_ndv_rd_init(const char *fname)
 {
        fatal(MYNAME ": This build excluded HSA Endeavour support because expat was not installed.\n");
 }
 
-void
+static void
 hsa_ndv_read(void)
 {
 }
@@ -227,7 +227,7 @@ hsa_ndv_cdata(void *dta, const XML_Char *s, int len)
        memcpy(estr, s, len); 
 }
 
-void
+static void
 hsa_ndv_rd_init(const char *fname)
 {
        fd = xfopen(fname, "r", MYNAME);
@@ -243,7 +243,7 @@ hsa_ndv_rd_init(const char *fname)
        XML_SetCharacterDataHandler(psr, hsa_ndv_cdata);
 }
 
-void
+static void
 hsa_ndv_read(void)
 {
        int len;
@@ -277,7 +277,7 @@ hsa_ndv_read(void)
 
 #endif
 
-void
+static void
 hsa_ndv_rd_deinit(void)
 {
        if ( cdatastr ) {
@@ -286,13 +286,13 @@ hsa_ndv_rd_deinit(void)
        fclose(fd);
 }
 
-void
+static void
 hsa_ndv_wr_init(const char *fname)
 {
        ofd = xfopen(fname, "w", MYNAME);
 }
 
-void
+static void
 hsa_ndv_wr_deinit(void)
 {
        fclose(ofd);
@@ -322,7 +322,7 @@ hsa_ndv_waypt_pr(const waypoint *waypointp)
        legNum++;
 }
 
-void
+static void
 hsa_ndv_write(void)
 {
        fprintf(ofd, "<?xml version=\"1.0\"?>\n");
@@ -373,10 +373,10 @@ ff_vecs_t HsaEndeavourNavigator_vecs = {
 #define INVALID_TIME -1L
 #define SOUNDARRAY_CHAR 'S'
 
-int readRecord( FILE* pFile, const char* pRecName, char *recData);
-int readPositionRecord( FILE* pFile, double* lat, double* lng, long* timeStamp);
+static int readRecord( FILE* pFile, const char* pRecName, char *recData);
+static int readPositionRecord( FILE* pFile, double* lat, double* lng, long* timeStamp);
 
-void readVersion4( FILE* pFile)
+static void readVersion4( FILE* pFile)
 {
        while( TRUE )
        {
@@ -475,7 +475,7 @@ void readVersion4( FILE* pFile)
 }
 
 // read a record to a file
-int readRecord( FILE* pFile, const char* pRecName, char *recData)
+static int readRecord( FILE* pFile, const char* pRecName, char *recData)
 {
        // get the rec name
        int len;
@@ -520,7 +520,7 @@ int readRecord( FILE* pFile, const char* pRecName, char *recData)
 }
 
 // read position
-int readPositionRecord( FILE* pFile, double* lat, double* lng, 
+static int readPositionRecord( FILE* pFile, double* lat, double* lng, 
                                                long* timeStamp)
 {
        // read the lat record

diff --git a/gpsbabel/kml.c b/gpsbabel/kml.c
index 4eb920cdaf1ec541829a83b0d584f5183ddf14e3..e71d664754d6a1a7c929ef73cef223ab709d2dfd 100644 (file)
--- a/gpsbabel/kml.c
+++ b/gpsbabel/kml.c
@@ -72,13 +72,13 @@ arglist_t kml_args[] = {
 #define MYNAME "kml"
 
 #if NO_EXPAT
-void
+static void
 kml_rd_init(const char *fname)
 {
        fatal(MYNAME ": This build excluded KML support because expat was not installed.\n");
 }
 
-void
+static void
 kml_read(void)
 {
 }
@@ -154,19 +154,19 @@ kml_read(void)
 }
 #endif
 
-void
+static void
 kml_rd_deinit(void)
 {
        xml_deinit();
 }
 
-void
+static void
 kml_wr_init(const char *fname)
 {
        ofd = xfopen(fname, "w", MYNAME);
 }
 
-void
+static void
 kml_wr_deinit(void)
 {
        fclose(ofd);

diff --git a/gpsbabel/nmea.c b/gpsbabel/nmea.c
index 0f62f4454637618e9570aa971455a2cc9f0e0eb9..a0aa326eac237fe8471475fd1cf32a40c58b60ee 100644 (file)
--- a/gpsbabel/nmea.c
+++ b/gpsbabel/nmea.c
@@ -186,7 +186,7 @@ nmea_wr_deinit(void)
        mkshort_del_handle(mkshort_handle);
 }
 
-void
+static void
 gpgll_parse(char *ibuf)
 {
        double latdeg, lngdeg;